Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Beobachtungsaufträge #147

Merged
merged 35 commits into from
Oct 8, 2020
Merged

Beobachtungsaufträge #147

merged 35 commits into from
Oct 8, 2020

Conversation

carlobeltrame
Copy link
Member

@carlobeltrame carlobeltrame commented Oct 7, 2020 •
edited
Loading

Fixes #115, fixes #116

Screenshot from 2020-10-07 12-19-37

allanbenelli and others added 30 commits October 5, 2020 08:39
@allanbenelli @carlobeltrame
Define Model & Relationsships
80e38d2
@allanbenelli @carlobeltrame
migration: table and foreign keys
35b3f66
@allanbenelli @carlobeltrame
prepare controller with index, edit & destroy
72368ce
@allanbenelli @carlobeltrame
prepare routes
5f50be5
@allanbenelli @carlobeltrame
view:index new part and translations
ae0ec53
@allanbenelli @carlobeltrame
add order_desc and change to entity
7968bd8
@allanbenelli @carlobeltrame
adjusted view
0d497d5
@allanbenelli @carlobeltrame
controller rules
1977b19
@allanbenelli @carlobeltrame
rechanged models but still not working
ff3d442
@allanbenelli @carlobeltrame
navigation linking
6aca874
@allanbenelli @carlobeltrame
fix column naming, create orders
35fcacd
@allanbenelli @carlobeltrame
overwiev and create observation_group
beae5f9
@allanbenelli @carlobeltrame
edit observation order view
5d883dd
@allanbenelli @carlobeltrame
edit and save observation order finished
aa33f2f
@allanbenelli @carlobeltrame
for cosinus, don't mind about test
36f2b58
@allanbenelli @carlobeltrame
cosinus commit to peerfix
e7278ff
@allanbenelli @carlobeltrame
fix blocknumber bug in observationassignment table
5dbd53b
@allanbenelli @carlobeltrame
base on course
1646c02
@allanbenelli @carlobeltrame
button success logic, but obs count wrong
92db07c
@allanbenelli @carlobeltrame
course model return view for crib
05e6f73
@carlobeltrame
Revert file permissions
13a4368
@carlobeltrame
Get it running with the latest Vue components updates
e83ea1b
@carlobeltrame
Make trainer perspective selectable on crib view
4eeb83f
@carlobeltrame
Rename observation orders to observation assignments
5cdff43
@carlobeltrame
Fix plural names of fields
05a2937
@carlobeltrame
Rename order_name to name
db8fc99
@carlobeltrame
Add tests for observation assignments
a076eae
@carlobeltrame
Redesign a little with help from @manuelmeister
a646315
@carlobeltrame
Add test for the mother of all queries
cce590a
@carlobeltrame
Load observation assignments only in the course that they belong to
689ff4c
@carlobeltrame carlobeltrame mentioned this pull request Oct 7, 2020
Closed
davudevren
davudevren approved these changes Oct 7, 2020
View reviewed changes
Copy link
Contributor

@davudevren davudevren left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Richtig nice!

wenn mer d'UUfträg uf ganzi Täg tue chent(wo denn all Blöck uuswählet), wärs na praktisch, aber chan mer denn immerna improve

@carlobeltrame
Copy link
Member Author

carlobeltrame commented Oct 7, 2020 •
edited
Loading

No problemo, Uswahl vo ganze Täg isch implementiert :) findi e super Idee

@davudevren
Copy link
Contributor

Richtig nice!, Chammer d'sortierig ändere, sodass d'Täg obe sind? hans versuecht im code nahluege, aber han gad ned gwüsst wie

@carlobeltrame
Copy link
Member Author

Nei, bisher sind d "Gruppe-Optione" bi allne Multiselects zunderscht, nach de simple Optione. Das isch au zB bi de TN-Gruppe so. Bi de Blöck chönnted ja in Zuekunft au mal no Usbildigsgfäss #120 dezue cho, und spätistens denn würi nüme wele a de Kursteams vorgä weli Art vo Optione zoberscht chunt.

allanbenelli
allanbenelli approved these changes Oct 8, 2020
View reviewed changes
Copy link
Contributor

@allanbenelli allanbenelli left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Passt, danke für dini ergänzige und tests cosinus! und ja, ich wür s zügs au zunderscht lah, gnau usem grund usbildigsgfäss. mer cha das ja umgah mit eifach sonntag ine schribe, und autocomplete reglet das ja

@carlobeltrame carlobeltrame merged commit 5d0f310 into master Oct 8, 2020
@carlobeltrame carlobeltrame deleted the observation_assignment branch October 8, 2020 13:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@allanbenelli allanbenelli allanbenelli approved these changes

@davudevren davudevren davudevren approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Auf Spick Ansicht auf anderes Equipenmitglied umschalten Beobachtungsaufträge
3 participants
@carlobeltrame @davudevren @allanbenelli